rename the example config files.
40ee75a9xFz6S05sDKu-JCLqyVTkDA tools/examples/network
40ee75a967sxgcRY4Q7zXoVUaJ4flA tools/examples/vif-bridge
40ee75a93cqxHp6MiYXxxwR5j2_8QQ tools/examples/xend-config.sxp
-41090ec8Pj_bkgCBpg2W7WfmNkumEA tools/examples/xmdefconfig
-40cf2937oKlROYOJTN8GWwWM5AmjBg tools/examples/xmdefconfig-example
-40dfd40auJwNnb8NoiSnRkvZaaXkUg tools/examples/xmdefconfig-netbsd
+41090ec8Pj_bkgCBpg2W7WfmNkumEA tools/examples/xmexample1
+40cf2937oKlROYOJTN8GWwWM5AmjBg tools/examples/xmexample2
3fbba6dbDfYvJSsw9500b4SZyUhxjQ tools/libxc/Makefile
3fbba6dc1uU7U3IFeF6A-XEOYF2MkQ tools/libxc/rpm.spec
3fbba6dcrNxtygEcgJYAJJ1gCQqfsA tools/libxc/xc.h
# Xen configuration dir and configs to go there.
XEN_CONFIG_DIR = /etc/xen
XEN_CONFIGS = xend-config.sxp
-XEN_CONFIGS += xmdefconfig
-XEN_CONFIGS += xmdefconfig-example
-XEN_CONFIGS += xmdefconfig-netbsd
+XEN_CONFIGS += xmexample1
+XEN_CONFIGS += xmexample2
# Xen script dir and scripts to go there.
XEN_SCRIPT_DIR = /etc/xen/scripts
+++ /dev/null
-# -*- mode: python; -*-
-#============================================================================
-# Python configuration setup for 'xm create'.
-# This script sets the parameters used when a domain is created using 'xm create'.
-# You use a separate script for each domain you want to create, or
-# you can set the parameters for the domain on the xm command line.
-#============================================================================
-
-#----------------------------------------------------------------------------
-# Kernel image file.
-kernel = "/boot/vmlinuz-2.4.26-xenU"
-
-# Optional ramdisk.
-#ramdisk = "/boot/initrd.gz"
-
-# The domain build function. Default is 'linux'.
-#builder='linux'
-#builder='netbsd'
-
-# Initial memory allocation (in megabytes) for the new domain.
-memory = 64
-
-# A name for your domain. All domains must have different names.
-name = "ExampleDomain"
-
-# Which CPU to start domain on?
-#cpu = -1 # leave to Xen to pick
-
-#----------------------------------------------------------------------------
-# Define network interfaces.
-
-# Number of network interfaces. Default is 1.
-#nics=1
-
-# Optionally define mac and/or bridge for the network interfaces.
-# Random MACs are assigned if not given.
-#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ]
-
-#----------------------------------------------------------------------------
-# Define the disk devices you want the domain to have access to, and
-# what you want them accessible as.
-# Each disk entry is of the form phy:UNAME,DEV,MODE
-# where UNAME is the device, DEV is the device name the domain will see,
-# and MODE is r for read-only, w for read-write.
-
-disk = [ 'phy:hda1,xda1,r' ]
-
-#----------------------------------------------------------------------------
-# Set the kernel command line for the new domain.
-# You only need to define the IP parameters and hostname if the domain's
-# IP config doesn't, e.g. in ifcfg-eth0 or via DHCP.
-# You can use 'extra' to set the runlevel and custom environment
-# variables used by custom rc scripts (e.g. VMID=, usr= ).
-
-# Set if you want dhcp to allocate the IP address.
-#dhcp="dhcp"
-# Set netmask.
-#netmask=
-# Set default gateway.
-#gateway=
-# Set the hostname.
-#hostname= "vm%d" % vmid
-
-# Set root device.
-root = "/dev/xda1 ro"
-
-# Root device for nfs.
-#root = "/dev/nfs"
-# The nfs server.
-#nfs_server = '169.254.1.0'
-# Root directory on the nfs server.
-#nfs_root = '/full/path/to/root/directory'
-
-# Sets runlevel 4.
-extra = "4"
-
-#----------------------------------------------------------------------------
-# Set according to whether you want the domain restarted when it exits.
-# The default is 'onreboot', which restarts the domain when it shuts down
-# with exit code reboot.
-# Other values are 'always', and 'never'.
-
-#restart = 'onreboot'
-
-#============================================================================
+++ /dev/null
-# -*- mode: python; -*-
-#============================================================================
-# Example Python setup script for 'xm create'.
-# This script sets the parameters used when a domain is created using 'xm create'.
-#
-# This is a relatively advanced script that uses a parameter, vmid, to control
-# the settings. So this script can be used to start a set of domains by
-# setting the vmid parameter on the 'xm create' command line. For example:
-#
-# xm create vmid=1
-# xm create vmid=2
-# xm create vmid=3
-#
-# The vmid is purely a script variable, and has no effect on the the domain
-# id assigned to the new domain.
-#============================================================================
-
-# Define script variables here.
-# xm_vars is defined automatically, use xm_vars.var() to define a variable.
-
-# This function checks that 'vmid' has been given a valid value.
-# It is called automatically by 'xm create'.
-def vmid_check(var, val):
- val = int(val)
- if val <= 0:
- raise ValueError
- return val
-
-# Define the 'vmid' variable so that 'xm create' knows about it.
-xm_vars.var('vmid',
- use="Virtual machine id. Integer greater than 0.",
- check=vmid_check)
-
-# Check the defined variables have valid values..
-xm_vars.check()
-
-#----------------------------------------------------------------------------
-# Kernel image file.
-kernel = "/boot/vmlinuz-2.4.26-xenU"
-
-# Optional ramdisk.
-#ramdisk = "/boot/initrd.gz"
-
-# The domain build function. Default is 'linux'.
-#builder='linux'
-#builder='netbsd'
-
-# Initial memory allocation (in megabytes) for the new domain.
-memory = 64
-
-# A name for the new domain. All domains have to have different names,
-# so we use the vmid to create a name.
-name = "VM%d" % vmid
-
-# Which CPU to start domain on?
-#cpu = -1 # leave to Xen to pick
-cpu = vmid # set based on vmid (mod number of CPUs)
-
-#----------------------------------------------------------------------------
-# Define network interfaces.
-
-# Number of network interfaces. Default is 1.
-#nics=1
-
-# Optionally define mac and/or bridge for the network interfaces.
-# Random MACs are assigned if not given.
-#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ]
-
-#----------------------------------------------------------------------------
-# Define the disk devices you want the domain to have access to, and
-# what you want them accessible as.
-# Each disk entry is of the form phy:UNAME,DEV,MODE
-# where UNAME is the device, DEV is the device name the domain will see,
-# and MODE is r for read-only, w for read-write.
-
-# This makes the disk device depend on the vmid - assuming
-# that devices sda7, sda8 etc. exist. The device is exported
-# to all domains as sda1.
-# All domains get sda6 read-only (to use for /usr, see below).
-disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
- 'phy:sda6,sda6,r' ]
-
-#----------------------------------------------------------------------------
-# Set the kernel command line for the new domain.
-# You only need to define the IP parameters and hostname if the domain's
-# IP config doesn't, e.g. in ifcfg-eth0 or via DHCP.
-# You can use 'extra' to set the runlevel and custom environment
-# variables used by custom rc scripts (e.g. VMID=, usr= ).
-
-# Set if you want dhcp to allocate the IP address.
-#dhcp="dhcp"
-# Set netmask.
-#netmask=
-# Set default gateway.
-#gateway=
-# Set the hostname.
-#hostname= "vm%d" % vmid
-
-# Set root device.
-root = "/dev/sda1 ro"
-
-# Root device for nfs.
-#root = "/dev/nfs"
-# The nfs server.
-#nfs_server = '169.254.1.0'
-# Root directory on the nfs server.
-#nfs_root = '/full/path/to/root/directory'
-
-# Sets runlevel 4 and the device for /usr.
-extra = "4 VMID=%d usr=/dev/sda6" % vmid
-
-#----------------------------------------------------------------------------
-# Set according to whether you want the domain restarted when it exits.
-# The default is 'onreboot', which restarts the domain when it shuts down
-# with exit code reboot.
-# Other values are 'always', and 'never'.
-
-#restart = 'onreboot'
-
-#============================================================================
+++ /dev/null
-# -*- mode: python; -*-
-#============================================================================
-# Example Python setup script for 'xm create'.
-# This script sets the parameters used when a domain is created using 'xm create'.
-#
-# This is a relatively advanced script that uses a parameter, vmid, to control
-# the settings. So this script can be used to start a set of domains by
-# setting the vmid parameter on the 'xm create' command line. For example:
-#
-# xm create vmid=1
-# xm create vmid=2
-# xm create vmid=3
-#
-# The vmid is purely a script variable, and has no effect on the the domain
-# id assigned to the new domain.
-#============================================================================
-
-# Define script variables here.
-# xm_vars is defined automatically, use xm_vars.var() to define a variable.
-
-# This function checks that 'vmid' has been given a valid value.
-# It is called automatically by 'xm create'.
-def vmid_check(var, val):
- val = int(val)
- if val <= 0:
- raise ValueError
- return val
-
-# Define the 'vmid' variable so that 'xm create' knows about it.
-xm_vars.var('vmid',
- use="Virtual machine id. Integer greater than 0.",
- check=vmid_check)
-
-# Check the defined variables have valid values..
-xm_vars.check()
-
-#----------------------------------------------------------------------------
-# Kernel image file.
-image = "/boot/netbsd"
-
-# The domain build function.
-builder='netbsd'
-
-# Initial memory allocation (in megabytes) for the new domain.
-memory = 16
-
-# A name for the new domain. All domains have to have different names,
-# so we use the vmid to create a name.
-name = "NETBSD%d" % vmid
-
-#----------------------------------------------------------------------------
-# Define network interfaces.
-
-# Number of network interfaces. Default is 1.
-#nics=1
-
-# Optionally define mac and/or bridge for the network interfaces.
-# Random MACs are assigned if not given.
-#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ]
-
-# Specify IP address(es), for the new domain. You need to
-# configure IP addrs within the domain just as you do normally. This
-# is just to let Xen know about them so it can route packets
-# appropriately.
-
-#ipaddr = [ xenctl.utils.add_offset_to_ip(xenctl.utils.get_current_ipaddr(),vmid),
-# xenctl.utils.add_offset_to_ip('169.254.1.0',vmid),
-# ]
-
-#----------------------------------------------------------------------------
-# Define the disk devices you want the domain to have access to, and
-# what you want them accessible as.
-# Each disk entry is of the form phy:UNAME,DEV,MODE
-# where UNAME is the device, DEV is the device name the domain will see,
-# and MODE is r for read-only, w for read-write.
-
-# This makes the disk device depend on the vmid - assuming
-# that devices sda7, sda8 etc. exist. The device is exported
-# to all domains as sda1.
-# All domains get sda6 read-only (to use for /usr, see below).
-disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
- 'phy:sda6,sda6,r' ]
-
-#----------------------------------------------------------------------------
-# Set the kernel command line for the new domain.
-# You only need to define the IP parameters and hostname if the domain's
-# IP config doesn't, e.g. in ifcfg-eth0 or via DHCP.
-# You can use 'extra' to set the runlevel and custom environment
-# variables used by custom rc scripts (e.g. VMID=, usr= ).
-
-# Set if you want dhcp to allocate the IP address.
-#dhcp="dhcp"
-# Set netmask.
-#netmask=
-# Set default gateway.
-#gateway=
-# Set the hostname.
-#hostname= "vm%d" % vmid
-
-# Set root device.
-root = "/dev/sda1 ro"
-
-# Root device for nfs.
-#root = "/dev/nfs"
-# The nfs server.
-#nfs_server = '169.254.1.0'
-# Root directory on the nfs server.
-#nfs_root = '/full/path/to/root/directory'
-
-# Sets runlevel 4 and the device for /usr.
-#extra = "4 VMID=%d usr=/dev/sda6" % vmid
-extra = "4 VMID=%d bootdev=xennet0" % vmid
-
-
-#----------------------------------------------------------------------------
-# Set according to whether you want the domain restarted when it exits.
-# The default is 'onreboot', which restarts the domain when it shuts down
-# with exit code reboot.
-# Other values are 'always', and 'never'.
-#
-#restart = 'onreboot'
-
-#============================================================================
--- /dev/null
+# -*- mode: python; -*-
+#============================================================================
+# Python configuration setup for 'xm create'.
+# This script sets the parameters used when a domain is created using 'xm create'.
+# You use a separate script for each domain you want to create, or
+# you can set the parameters for the domain on the xm command line.
+#============================================================================
+
+#----------------------------------------------------------------------------
+# Kernel image file.
+kernel = "/boot/vmlinuz-2.4.26-xenU"
+
+# Optional ramdisk.
+#ramdisk = "/boot/initrd.gz"
+
+# The domain build function. Default is 'linux'.
+#builder='linux'
+#builder='netbsd'
+
+# Initial memory allocation (in megabytes) for the new domain.
+memory = 64
+
+# A name for your domain. All domains must have different names.
+name = "ExampleDomain"
+
+# Which CPU to start domain on?
+#cpu = -1 # leave to Xen to pick
+
+#----------------------------------------------------------------------------
+# Define network interfaces.
+
+# Number of network interfaces. Default is 1.
+#nics=1
+
+# Optionally define mac and/or bridge for the network interfaces.
+# Random MACs are assigned if not given.
+#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ]
+
+#----------------------------------------------------------------------------
+# Define the disk devices you want the domain to have access to, and
+# what you want them accessible as.
+# Each disk entry is of the form phy:UNAME,DEV,MODE
+# where UNAME is the device, DEV is the device name the domain will see,
+# and MODE is r for read-only, w for read-write.
+
+disk = [ 'phy:hda1,xda1,r' ]
+
+#----------------------------------------------------------------------------
+# Set the kernel command line for the new domain.
+# You only need to define the IP parameters and hostname if the domain's
+# IP config doesn't, e.g. in ifcfg-eth0 or via DHCP.
+# You can use 'extra' to set the runlevel and custom environment
+# variables used by custom rc scripts (e.g. VMID=, usr= ).
+
+# Set if you want dhcp to allocate the IP address.
+#dhcp="dhcp"
+# Set netmask.
+#netmask=
+# Set default gateway.
+#gateway=
+# Set the hostname.
+#hostname= "vm%d" % vmid
+
+# Set root device.
+root = "/dev/xda1 ro"
+
+# Root device for nfs.
+#root = "/dev/nfs"
+# The nfs server.
+#nfs_server = '169.254.1.0'
+# Root directory on the nfs server.
+#nfs_root = '/full/path/to/root/directory'
+
+# Sets runlevel 4.
+extra = "4"
+
+#----------------------------------------------------------------------------
+# Set according to whether you want the domain restarted when it exits.
+# The default is 'onreboot', which restarts the domain when it shuts down
+# with exit code reboot.
+# Other values are 'always', and 'never'.
+
+#restart = 'onreboot'
+
+#============================================================================
--- /dev/null
+# -*- mode: python; -*-
+#============================================================================
+# Example Python setup script for 'xm create'.
+# This script sets the parameters used when a domain is created using 'xm create'.
+#
+# This is a relatively advanced script that uses a parameter, vmid, to control
+# the settings. So this script can be used to start a set of domains by
+# setting the vmid parameter on the 'xm create' command line. For example:
+#
+# xm create vmid=1
+# xm create vmid=2
+# xm create vmid=3
+#
+# The vmid is purely a script variable, and has no effect on the the domain
+# id assigned to the new domain.
+#============================================================================
+
+# Define script variables here.
+# xm_vars is defined automatically, use xm_vars.var() to define a variable.
+
+# This function checks that 'vmid' has been given a valid value.
+# It is called automatically by 'xm create'.
+def vmid_check(var, val):
+ val = int(val)
+ if val <= 0:
+ raise ValueError
+ return val
+
+# Define the 'vmid' variable so that 'xm create' knows about it.
+xm_vars.var('vmid',
+ use="Virtual machine id. Integer greater than 0.",
+ check=vmid_check)
+
+# Check the defined variables have valid values..
+xm_vars.check()
+
+#----------------------------------------------------------------------------
+# Kernel image file.
+kernel = "/boot/vmlinuz-2.4.26-xenU"
+
+# Optional ramdisk.
+#ramdisk = "/boot/initrd.gz"
+
+# The domain build function. Default is 'linux'.
+#builder='linux'
+#builder='netbsd'
+
+# Initial memory allocation (in megabytes) for the new domain.
+memory = 64
+
+# A name for the new domain. All domains have to have different names,
+# so we use the vmid to create a name.
+name = "VM%d" % vmid
+
+# Which CPU to start domain on?
+#cpu = -1 # leave to Xen to pick
+cpu = vmid # set based on vmid (mod number of CPUs)
+
+#----------------------------------------------------------------------------
+# Define network interfaces.
+
+# Number of network interfaces. Default is 1.
+#nics=1
+
+# Optionally define mac and/or bridge for the network interfaces.
+# Random MACs are assigned if not given.
+#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ]
+
+#----------------------------------------------------------------------------
+# Define the disk devices you want the domain to have access to, and
+# what you want them accessible as.
+# Each disk entry is of the form phy:UNAME,DEV,MODE
+# where UNAME is the device, DEV is the device name the domain will see,
+# and MODE is r for read-only, w for read-write.
+
+# This makes the disk device depend on the vmid - assuming
+# that devices sda7, sda8 etc. exist. The device is exported
+# to all domains as sda1.
+# All domains get sda6 read-only (to use for /usr, see below).
+disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
+ 'phy:sda6,sda6,r' ]
+
+#----------------------------------------------------------------------------
+# Set the kernel command line for the new domain.
+# You only need to define the IP parameters and hostname if the domain's
+# IP config doesn't, e.g. in ifcfg-eth0 or via DHCP.
+# You can use 'extra' to set the runlevel and custom environment
+# variables used by custom rc scripts (e.g. VMID=, usr= ).
+
+# Set if you want dhcp to allocate the IP address.
+#dhcp="dhcp"
+# Set netmask.
+#netmask=
+# Set default gateway.
+#gateway=
+# Set the hostname.
+#hostname= "vm%d" % vmid
+
+# Set root device.
+root = "/dev/sda1 ro"
+
+# Root device for nfs.
+#root = "/dev/nfs"
+# The nfs server.
+#nfs_server = '169.254.1.0'
+# Root directory on the nfs server.
+#nfs_root = '/full/path/to/root/directory'
+
+# Sets runlevel 4 and the device for /usr.
+extra = "4 VMID=%d usr=/dev/sda6" % vmid
+
+#----------------------------------------------------------------------------
+# Set according to whether you want the domain restarted when it exits.
+# The default is 'onreboot', which restarts the domain when it shuts down
+# with exit code reboot.
+# Other values are 'always', and 'never'.
+
+#restart = 'onreboot'
+
+#============================================================================
def var_usage(self):
if self.vars:
- print 'The defconfig defines the following variables:'
+ print 'The config file defines the following variables:'
for var in self.vars:
var.show()
print
else:
p = self.vals.defconfig
if os.path.exists(p):
- self.info('Using defconfig file %s.' % p)
+ self.info('Using config file "%s".' % p)
self.load(p, help)
break
else:
- self.err("Cannot open defconfig file %s" % self.vals.defconfig)
+ self.err('Cannot open config file "%s"' % self.vals.defconfig)
def load(self, defconfig, help):
"""Load a defconfig file. Local variables in the file
projects / xen.git / commitdiff